Apply more Android Studio version 0.3 upgrades