Upgrade to Gradle 2.1.
Commit reconciled merge.