Switched to Android Studio 1.x