merged android into master