am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows."

* commit '42640e5224a861690de006952470451d18337256':
  Add missing #include <memory> for std::unique_ptr on Windows.