Merge "adb: add better logging for connection failure." am: 627a74b714
am: 8861d4f8ea

Change-Id: I0bfc6a19047750a04cdf44c9f5df0889f235660f