am 3b5408b5: Merge "Fix failing hprof DCHECK"

* commit '3b5408b565509341301e6da82f3d07c75aad5f51':
  Fix failing hprof DCHECK