Fixed Linaro build errors