Revert "Revert "andorid""

This reverts commit 65fe6a46efa6f6fa9095ccdc0fcb9aed85163358.