Upgrading to android-maven-plugin-3.6.0 to handle  Android SDK Tools r22 layout changes.
This required switching from using case statement with R.id fields to if/else as the fields are no longer final for libraries.
Merge remote-tracking branch 'origin/master'