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

Change-Id: Ic43f9daf5630059e9b627e4732e1e832d67c4b9c