Upgrade Gradle and Android Gradle plugin