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

This reverts commit 2f18596bd01495c3865b6562fbcec41fba6c5203.