Fixed issues when updating to Android Studio RC4