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

* commit '5f380611d29cb4bdd78ac1c0a2f63912de452567':
  Use canonical UniquePtr.h file