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

* commit '117af5f2067c740471f76821934b99d6c5726c3d':
  Revert "Revert "Upgrade to dlmalloc 2.8.5.""