Updated stuff for Android Studio 0.3.6