Updating conf to Android Studio 0.36