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

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



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