Upgraded to android-maven-plugin 3.6