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

* commit 'bc3c21b93f8d0529ba992fa18bd99c4d9b5cd625':