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