updated for new Android Studio beta