Merge "Clean cruft out of envsetup.sh" into main am: 9f94972a

Original change: https://android-review.googlesource.com/c/platform/build/+/3094897



Change-Id: I2df07f0be492d7cd32322b14e5418d88f246c31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>