am 1d640f05: Merge "Use canonical UniquePtr.h header"

* commit '1d640f05dcedfcaae63eeb90f3d89b16e95d0208':
  Use canonical UniquePtr.h header