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

Change-Id: Iff7993e9fc1ee932497f190e04a71d05784397eb