Edit for build with Linaro 4.8