F22 Self Contained Change: Gradle 2.x