Make Linaro 4.9 compatible