Merge "Improve accounting of native roots in hprof"