Upgrade Maven/Android build again