Revert "Merge "Use canonical UniquePtr.h header""

This reverts commit e35dafa88f1ba15a30b95556755ab17c7207be9d, reversing
changes made to 70789f277025960f499d4155ac2ec1c79bc8e734.