am db794197: Merge "Fix debug malloc."

* commit 'db794197cc880e3805bcefbea780476a359066c2':
  Fix debug malloc.