Update project for new Android Studio version (RC-4)