Merge "Fix field ordering for String in hprof" into mnc-dev