Changes for build with linaro 4.8