am c7cb88f1: (-s ours) am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""

* commit 'c7cb88f1677fcee87ebe09054cb7f217de33626e':
  Revert "Move to the canonical UniquePtr.h."