Merge "adb: remove SendConnectOnHost." am: 5eaa5bc081
am: 86a919041f

Change-Id: Iabd1a7ab7ac3e70ad7735efc83c669a98f4cdbe9