Updating to work with Android Studio Beta