Merge branch 'master' of https://github.com/hanspeide/maven-android-plugin
Merge branch 'master' of https://github.com/hanspeide/maven-android-plugin