Added support to Android Studio 0.4.+