Updated to work with Android Studio v0.8.1