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

* aosp/upstream:
  Use sync.Map for type field cache
  Write ninja file directly to the output file
  Add pprof labels

Test: m checkbuild
Change-Id: I15d2689b25fc8a654f7eb4b9de5b64c5cc96ed5f