Revert "fix gcc4.7 compile"

This reverts commit 9b1de7e76da50d21e2c1a4618186d3a2424bf069.
Linaro 4.8 fixes

Added Linaro 4.8.2 Fixes

Change-Id: I009d6cbdcd3473bd7556e33ca650aaf290e75b65