Use canonical UniquePtr.h header

Change-Id: Iab1dc428c2330a07a5944a1cfbb25c8134b11950
Merge "Use canonical UniquePtr.h header"