Merge "Gradle 2.2.1" into studio-1.0-release