Further adjustments for Android Studio.