Android Studio 8.2.0 beta compatability
Make sure we don't accidentially bring in Android L stuff