Add ANDROID_HOME env var and comment out some others