am 17687079: am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."

* commit '17687079519c9014ee6c5ad2d13c3163d40a02ce':
  Upgrade to dlmalloc 2.8.5.