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

* commit 'e05ac5415e861dee6a3f175c8066ff577736ba1f':
  Upgrade to dlmalloc 2.8.5.