Updated for Android Studio 1