am 9c0c056b: am 6b1aa1b1: am db794197: Merge "Fix debug malloc."

* commit '9c0c056beddf8c4100769ad01404311a6d70efae':
  Fix debug malloc.