Merge "envsetup: fix path to build/bazel/bin tools" into main am: 1348d34e am: b159c5c4

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



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