Merge "adb: factor out socket specification."