am 607fa7b0: Merge "Now we have a proper C++ library, use std::unique_ptr."

* commit '607fa7b07233a7233ebe21bba8f3e7c1925ae0f2':
  Now we have a proper C++ library, use std::unique_ptr.