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

* aosp/upstream:
  Fix PropertyNameForField for X86.
  Support unpacking capitalized property names
  Make ninjaString an interface

Fixes: 148865218
Test: m checkbuild
Change-Id: I3680cd261bf420601a7b943e21acde6837ae8619