Revert "Android rollback"

This reverts commit 92d6d3ba9383beef9f9cb1236945a41f1a5c6dd6.