workarounds to build with linaro 4.8.1