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

This reverts commit 32a5b6e09b7aec4dc832c2b56838b0cd5bbf1fcb.