Merge "adb: factor out socket specification." am: bd7d2e2ec0 am: f95e728431 am: 4c58c8a892
am: b1cadcfc5b

Change-Id: I1eacd5f80971b5fa0f4b5e6235e30c641e84cf59