Fix build with Linaro (2/2)