Linaro 4.9 compilation errors fix
Merge branch 'optimization/kernel'