Grr, silly android toolchains.
Revert "fixed compiler warnings"

This reverts commit 9244cbfacb4588c8d816af0ad01006e8cea22333.