Fixes for new Android Studio
Merge pull request #4 from mattprecious/edenman/new-android-studio

Fixes for new Android Studio