Merge "Fix mismatched malloc/free delete/new."