More Android Studio changes, and more other changes. Still mixed together.