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

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