Upgrade to Gradle 2 final