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

Change-Id: I94a784f37c729291d840bae93c0e3b2647eb92f4