Revert "Changes for linaro compilation"

This reverts commit ecfc3068e5bc4bd72d00eef79549787c700902f3.