Merge "Move to the canonical UniquePtr.h."