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

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