Compatibility with Android Studio 0.8.6