Fixes for Gradle and Android Studio 1.0