Merge "Fix debug malloc for LP64."