am c372a778: Merge "libbase_test: get it building for Windows"

* commit 'c372a778626dffdf6d1be5f98eafa966a95be082':
  libbase_test: get it building for Windows