Update for latest Android Gradle changes