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

* aosp/upstream:
  Fix missing glob filelists when sandboxed
  Fix primary builder reruns caused by globs
  Add EarlyModuleContext.BlueprintsFile

Test: m checkbuild
Change-Id: I239f16f6f9fe9ba0e83da28bdc4f32d8ee807351