Merge branch 'aosp/upstream' into master

* aosp/upstream:
  Prevent glob from accessing hidden files

Bug: 33672964
Bug: 32676828
Bug: 33744259
Test: Soong's build.ninja files are the same before/after
Test: Doesn't crash on bad .git symlinks anymore
Change-Id: Ib11953092e270101c9f9b6f2961d22660f99b979