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

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



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