Merge pull request #6145 from gwicks/android-buildupdate Android: Update gradle version to 4.1 and plugin to 3.0
