Merge "Fix malloc debugging for LP64."