Merge "libbase_test: get it building for Windows"