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

* commit '1bb7f157f5a562422ab88a2fbecec320ebed8d36':
  Get libbase tests working on Windows.