Merge "Use canonical UniquePtr.h header"