am 0b4b67c4: am 1d640f05: Merge "Use canonical UniquePtr.h header"

* commit '0b4b67c488f68b6d359972098fc44e3126d1f426':
  Use canonical UniquePtr.h header