More updates to work with the new Android Studio and Gradle versions