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

* commit '8569a3b3223b843e601a8e1f9c02214c59858574':
  Ensure that libbase and liblog can be built for Windows.