Merge "Update Gradle build"