Updated for latest Android Studio.