A few more updates for Android Studio support