am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""

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