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

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