Upgraded maven-android-plugin to 3.6.0