am 1129f6a7: am b931f906: Merge "Upgrade to dlmalloc 2.8.5."

* commit '1129f6a78708a8d8861f8053616c3961aefdc1ef':
  Upgrade to dlmalloc 2.8.5.