Updates to keep up with Android Studio 1.0.