handle canary upgrade of Android Studio, fix gradle settings