Android updates

Fixing up the android version to use new techniques