fix Bad merge

Change-Id: I72fd738560f002526d37bfa824fdf1ad5f20837f
Add flags and fixes for gcc 4.8

Change-Id: I0094a31cd30243d0a5c948284c3ccf26358d280e