Revert "Linaro 4.8 fixes"

This reverts commit 89b5290a1e2252eabe4ec1f457c618dfb5775cbb.
fix build