More updates to support Android Studio