Merge "adb: factor out socket specification."
am: bd7d2e2ec0

Change-Id: I14f452e11395139f5687e5096af5b278eb14d63d