am 84ac402f: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev

* commit '84ac402fa1860817ed100d189b0613f8c4b0ef2a':
  Revert "Revert "Upgrade to dlmalloc 2.8.5.""