Ugly port to android
Revert "Ugly port to android"

This reverts commit 0f7ef245a9d0c8be533e5045b475e51acacec520.
Add another android hack