Fixes for Android Studio 1.0.