Android Studio and gradle updated

No coding changes apart from changes made to update app for new Android
Studio and new gradle.