Merge "Revert "Move to the canonical UniquePtr.h.""