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

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