Possible Linaro build fix