Updated Android Gradle builder