Update to work with android studio beta
Merge pull request #24 from box/android_studio_beta

Update to work with android studio beta