Merge changes I784bea3a,Id3b2dfdc

* changes:
  adb-remount-test: report lsusb for broken connection
  adb-remount-test: stderr cleanup