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

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