am 380d24d9: Merge "Compatibility layer to transition from UniquePtr to std::unique_ptr."

* commit '380d24d9af676d047148083774fa634b77a00634':
  Compatibility layer to transition from UniquePtr to std::unique_ptr.