Update to build with Gradle 2.1