am 933f4fd4: Merge "Ensure that libbase and liblog can be built for Windows."

* commit '933f4fd413f5a6c0e32c7963f1d0da580085df38':
  Ensure that libbase and liblog can be built for Windows.