Merge "envsetup.sh: work around zsh's built-in `which`." into main am: aa26ce4d

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



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