Merge "Revert "adb: remove win32 dependency on libwinpthread-1.dll."" am: 87eb0fc3d0
am: 00613c52ca

Change-Id: Ie780290c64ccd3bc49df9007e5ceb136aa08e6a6