Adding support for the new Android Studio IDE