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

* aosp/upstream:
  prevent file=nil panic if syntax error in Blueprints
  have openAndParse use return values rather than channels
  rename parseOneAsync to openAndParse
  Update microfactory compile error message to show the command that failed

Test: see tests on individual commits

Change-Id: I5faa4c8f5bc1a3845f7c7fcdbd5edb8d4e000acc