Merge "adb: fix socket tests." am: e998abd am: 61f6d1d
am: ba8498b

* commit 'ba8498b41b7e3e7fda6e70221a21c1a9559fe72a':
  adb: fix socket tests.

Change-Id: I624c8c1c0ba42b2bd91374499c72ea530cca9d60