Merge "Change UniquePtr to std::unique_ptr"
am: 625d6a8cd8

Change-Id: I82038cecd58de96f234095f9483419cc0627df8e