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

* commit '6b1aa1b16bc2cf8ba17e33fca4ffc399368b356c':
  Fix debug malloc.