Changes to support new Android Studio version 0.5.0