Update to build with Android Studio 1.0