Revert Fix Linaro toolchain warnings
commit a1e8aed2605ff49853ff0307cbdddedb9f3ca844