Revert "Fixes for Linaro 4.7 Toolchain - From Solid Kernel"

This reverts commit 543446e4cf24760d1d6f30af062406ab3063bae7.