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