Some more android studio changes.