am 598319d0: am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."

* commit '598319d01743427aa67faf4f54ae6d837c8c6d2e':
  Fix mismatched new[]/delete.