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

* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
  Fix mismatched new[]/delete.