am 08fe47e3: (-s ours) am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes"

* commit '08fe47e3bdc3c119c37539da9b013bd6510b0fa7':