Update Gradle version.
Merge with conflict resolution from master.