Android Studio 1.0 compatibility

removing conflicting entries