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

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