Improve Android support in build system.