Android Studio 8.2.0 beta compatability
Make sure we don't accidentially bring in Android L stuff
remove debug changes
Merge pull request #39 from shemnon/master

Android Studio 8.2.0 beta compatability