Work with Android Studio 1.0 RC4
Merge pull request #552 from kjeremy/android_studio_10

Work with Android Studio 1.0 RC4