Revert "android"

This reverts commit a44be88f25d05cfab6dde58038d491d1bb32b02f.
Android