merge Android support into master