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

* aosp/upstream:
  Support custom trace functions
  Implement microfactory Config, Build
  Allow microfactory to be used as a package
  Stop passing path to microfactory source

Test: m -j blueprint_tools
Change-Id: I857aeb6970d4d51489513f6ea789064d0f9f6556