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

Change-Id: I58794c4e5325a2f1bd0812bed2d451c82ba97056