Fix incompatibility with Linaro GCC 4.8

Change-Id: Ia927e5d99e224caea40dec4d75775d262271a4f4