Merge "win32: adb_test/libbase_test fixes"