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

* commit '14b66bffb08d23ad16d69b62d1fbfda769db1c12':
  Fix malloc debugging for LP64.