Changes for Android Studio version and Gradle version