am aa2e6e38: am 892145a6: Revert "hammerhead: switch back to dlmalloc"

* commit 'aa2e6e38927ebf12072e33fff486d971af039286':
  Revert "hammerhead: switch back to dlmalloc"