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

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