am 0ce3a783: Merge "Indicate this uses dlmalloc."

* commit '0ce3a783d549d023ddc553a04fed717ffb2ff533':
  Indicate this uses dlmalloc.