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

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