fix up building for Linaro 4.6.x & 4.7.x