Linaro 4.9 compilation errors fix