Upgrade Android Studio fixes