am 5d139e0a: Merge "Use canonical UniquePtr.h header"

* commit '5d139e0a9e59c1969b1075ec2f67e2802bffa0a6':
  Use canonical UniquePtr.h header