Fix build after latest Gradle/Android Studio update