am 94517894: Merge "Use canonical UniquePtr.h file"

* commit '9451789479878a8d5974e94aa2deec1911914414':
  Use canonical UniquePtr.h file