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

* commit '345fc6252a3e5c6113be893638f4746a54173489':
  Move to the canonical UniquePtr.h.