Fix for Linaro build error