Merge "Use unique_ptr to free objects when ASSERT* fail." am: 93aedcaf2b
am: 0ece9f4ccd

* commit '0ece9f4ccd3093193ebce9d5ca25c7ad097cafe9':
  Use unique_ptr to free objects when ASSERT* fail.