am a6f2c0fb: am 1bb7f157: am abdf6987: Merge "Get libbase tests working on Windows."

* commit 'a6f2c0fb41210803fdcf85c35f2d6c1c8c750714':
  Get libbase tests working on Windows.