Merge "Remove copy of UniquePtr.h"