Fix build with gcc 4.8

Change-Id: I00c03521d2eadaf5e2ba301d3cef376a9ee2c586
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Merge branch 'linaro' into HEAD

Conflicts:
	msm8960/common.mk

Change-Id: Idc2ee354d053db6e0c0833ce76a3c57bdf5dd5c1
Signed-off-by: DHOMD <DHO@dho.im>