Upgrade to latest android-maven-plugin