Revert build errors using Linaro Toolchain 4.7