Experiment with building Android through Maven
Merge branch 'AndroidMaven'
Enable android and androidtest as modules in the unified Maven build now