am 832b6dc4: am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes"

* commit '832b6dc4bb824e4e061431698bbf050876bb2418':
  win32: adb_test/libbase_test fixes