Update for Gradle 2.2 and Android Studio 1.0