Merge "adb: remove SendConnectOnHost." am: 1aebc2d4df am: e30f089164
am: c2bf22f58e

Change-Id: Iff7993e9fc1ee932497f190e04a71d05784397eb