am 42b59f6a: am dd13f157: Merge "Fix mismatched new[]/delete."

* commit '42b59f6ada0fac613776b4d1f9d3b350c214b572':
  Fix mismatched new[]/delete.