Work with Android Studio 1.0 RC4

Fixes  #551