Merge "Revert "adb: remove win32 dependency on libwinpthread-1.dll.""