am 0056a41d: am 345fc625: Merge "Move to the canonical UniquePtr.h."

* commit '0056a41d2a1ffd75644451b54e4ccacbbba75a5c':
  Move to the canonical UniquePtr.h.