Upgrade to gradle 2.2