am 8545944d: am e3bbb2ab: (-s ours) am 6c04e9a9: am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows."

* commit '8545944dcf35240e760e02131c2ff2a5d8dc511e':