Merge "adb: fix socket tests."