Revert "Fixes to allow building with Linaro 4.7 toolchain"

This reverts commit 16062c17a5e9f11f0c21682f2908648f053a7032.