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

* aosp/upstream:
  Finish switching blueprint back to the original Blueprints format
  Have bpfmt show usage when run without any arguments
  Refactor in preparation to detect when stdout is the input file
  Add file locking to microfactory
  Utils to support removing duplicate shared_libs

Test: m checkbuild
Change-Id: Ibeb8e48a6c0fa3669e78d034bff89ba6faa6ccc4