am 81508de3: am f0036944: Merge "Fix debug malloc."

* commit '81508de3d277db2ef3c8aa55b57ce3ce0a142e48':
  Fix debug malloc.