Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Append / to directories in Glob results

Bug: 71906438
Test: out/soong/build.ninja is identical
Change-Id: Ic4c64015e9b6e70887fdc8c6f70b021b01886f1c