Revert "Linaro 4.8 fixes"

This reverts commit 4e35cb8de56297b5138d99f71359d9d731ad0a89.

Change-Id: Iad6d06f0206d9585abcbf8b451884d984df5b428
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>