am 1e149df8: am d9a74ee9: Merge "Use canonical UniquePtr.h header"

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