updated to work with Android Studio 0.8.12