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

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