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

* aosp/upstream:
  Add ShouldFollowSymlinks argument to pathtools.Glob
  Fix recursive globs through symlinks
  Add symlink support to mockFs
  Add OsFs tests for escaped globs
  Improve error message for globbed dangling symlink

Test: m checkbuild
Change-Id: I02b8dc8d04c2d88efa228db233ae3c92eedc7cec