Upgraded for RC version of Android Studio tools