Update to android-maven-plugin 3.6.0
Merge pull request #491 from NineWorlds/android-sdk-21

Update to android-maven-plugin 3.6.0