am 3d1653b9: am bc3c21b9: (-s ours) am c3766916: am 8c61e029: Merge "adb_test/libbase_test: win32: get some tests working"

* commit '3d1653b9d95a661a1d76b4b1793cca7206d29042':