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

* commit '30f89b6f32e102454d3fbecd797c2b98d1262d01':
  Hide various debug malloc implementation details.