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

* commit '669786406ba61ac261af9947db5814fd892938f4':
  Use canonical UniquePtr.h header