Modified for Linaro-4.8 building