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

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