Updated to Android Gradle plugin 0.9.+