tree a2ff5b4b54d21324fe2cbcefd8db2d5d48213178
parent 27513cab25fd5aeae535d45bd0d1977e430cb042
author Colin Cross <ccross@android.com> 1565394322 -0700
committer Colin Cross <ccross@android.com> 1566680983 -0700

Revert "Backport upstream changes to allow printing field names verbatim."

This reverts commit 6979a8253ba28d1cbe53d5cbec83faaf4491320e.

Replacing with merge from upstream.

Bug: 117607748
Test: m checkbuild
Change-Id: Idb49dde7db8d76e06f211e21db63ce3fbfad4a2e