Merge "adb: fix socket tests."
am: e998abd

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

Change-Id: Ieb4ecd90c49d4d99c24bd9658f2568176956ddc9