Merge "adb: remove win32 dependency on libwinpthread-1.dll." am: 1d73abb443
am: ef260561f3

Change-Id: Id5d828b6d68d93b5d6aa5a1d2e701c72340b88a0