am 7d563651: am e35dafa8: Merge "Use canonical UniquePtr.h header"

* commit '7d563651aa956c0f9831b7b64be35c2ec790bdec':
  Use canonical UniquePtr.h header