am 3c13dade: am 14b66bff: Merge "Fix malloc debugging for LP64."

* commit '3c13daded375cad5fc77613872a85639cd09f54f':
  Fix malloc debugging for LP64.