Update android-maven-plugin dependency to 3.6.0 to handle new directory ...

...structure of ADT 22