am f0036944: Merge "Fix debug malloc."

* commit 'f0036944a13a76dddda70347032128d4a27081d6':
  Fix debug malloc.