am fe87596a: am c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."

* commit 'fe87596a5ba5a5b0773b2854f9fce85f49367611':
  Upgrade to dlmalloc 2.8.5.