Merge "Fix hprof/ahat for string compression."
am: 4e4b62e216

Change-Id: I217e0e2000cbb4082ebcc65736a63c02431f289c