Updated for Android Studio 1.0