Make compatible with Android Studio 0.5.4