am 20329fa4: am 6d457fe1: Merge "Enable building libbase on Windows."

* commit '20329fa4274128beadd1dde04edd26478673f116':
  Enable building libbase on Windows.