linaro 4.8 fixups