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

* commit '7ad8667042751451a8a986df86f1470ac29dccc9':
  Enable building libbase on Windows.