Updated Android Gradle Plugin and BuildTools