Applied some changes for Android Studio 1.0-RC2