Update to build with Android Studio 0.4.0