Update to build with Android Studio Beta