Updated to Gradle 2.2