am 97c96f5a: Merge "Fix mismatched malloc/free delete/new."

* commit '97c96f5aab22f75dd54089bdc194588a4b5a2e8d':
  Fix mismatched malloc/free delete/new.