Merge "adb: fix adb client running out of sockets on Windows" am: 1e2382a027 am: edb78620fb
am: 507c813313

* commit '507c813313e0b37e3b08b1a6e0bf9910ccc37212':
  adb: fix adb client running out of sockets on Windows