am f07db754: am 0a91b11d: Merge "More debug malloc fixes."

# Via Android Git Automerger (1) and others
* commit 'f07db75443cce4ab96c93bdaa0793d7b8e87547e':
  More debug malloc fixes.