am adca2d53: Merge "Use canonical UniquePtr.h header"

* commit 'adca2d53b3cade9e491bf49e4f5828449a606241':
  Use canonical UniquePtr.h header