Merge "Fix hprof/ahat for string compression."