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

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