Revert "android"

This reverts commit 62c805597e443052a832e5e6d86258f7bc52344f.
Revert "Revert "android""

This reverts commit 464b44a89fc2555c05ac862ca88198afd96db585.