Updated for Android Studio