Merge "Output static field values in dexdump" am: 1a74dc4209
am: 99dd068563

* commit '99dd068563bbd460f5ba8c81249e6e55e794de5e':
  Output static field values in dexdump