updates from new Android Studio.