am aafa3d0e: Merge "Hide various debug malloc implementation details."

* commit 'aafa3d0e4623f3c57c7abe66f6afa726b9cde348':
  Hide various debug malloc implementation details.