am 0cffac0c: Merge "Fix field ordering for String in hprof" into mnc-dev

* commit '0cffac0c639d81e77d82c29ed423c91fb4da073b':
  Fix field ordering for String in hprof