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

* commit 'c61955305e4e6b222801e694af9d578b39485ac5':
  win32: adb_test/libbase_test fixes