Updating gradle build files for latest version of Android Studio