Upgrade to Gradle 2.2.1