Upgrade Maven/Android build