Upgrade android-maven-plugin to 3.6.1