Update for Android Studio Beta