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

* aosp/upstream:
  Add Context.SetFs

Bug: 146437378
Test: m checkbuild
Change-Id: I5d40d2467957b34fb8787b5d12b9b994d8627ad1

context.go

@@ -889,6 +889,10 @@ func (c *Context) MockFileSystem(files map[string][]byte) {
 	c.fs = pathtools.MockFs(files)
 }
 
+func (c *Context) SetFs(fs pathtools.FileSystem) {
+	c.fs = fs
+}
+
 // openAndParse opens and parses a single Blueprints file, and returns the results
 func (c *Context) openAndParse(filename string, scope *parser.Scope, rootDir string,
 	parent *fileParseContext) (file *parser.File,