Part three of Update for Android Studio 1.0

Updated to Android Studio 1.0+