am 4a2a890b: Merge "Fix mismatched new[]/delete."

* commit '4a2a890b32a1e8c3ffeea82b3c12f707b5a9b8f4':
  Fix mismatched new[]/delete.