Update for Android Studio 0.4.0