Merge "Remove references to dlmalloc specific functions" am: 1f312652e1
am: ed3ae851f0

* commit 'ed3ae851f06f8ff6c2c0e86011e3df83267a7f09':
  Remove references to dlmalloc specific functions