Revert "Android: Fix up warnings introduced by 32 on 64 bit support"

This reverts commit b7e46105cae50b29ac0b08e2e3c04b5ca34bc2a5, a better
implementation will be being merged.
2 files changed