Upgrading Android Gradle Plugin

Ryan Hargrequested to merge
housekeeping/upgrade-android-gradle-plugin-and-cleanup into develop

Also moving some model classes

Merge request reports