Linaro 4.8 build fix