Fixes for Android Studio 1.0 and new Gradle.