Upgraded to new Android Studio.