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

* aosp/upstream:
  Make proptools functions consistently take *struct types
  Add isStruct and isStructPtr helpers
  Fix null pointer dereference printing an expression.

Test: m checkbuild
Change-Id: I547f3cd5f286edd32efee60a7300c7eabe293e7b