Merge "Fix debug malloc."