Updated Android gradle plugin and Gradle