am 4e9d3ce2: (-s ours) am 0056a41d: am 345fc625: Merge "Move to the canonical UniquePtr.h."

* commit '4e9d3ce295ea57cf92d734617a6d0947d0fb7aa4':
  Move to the canonical UniquePtr.h.