Android update

This updates the android files.