am 0c428e4d: am 91acb148: Revert "adb: Another attempted workaround for the adb disconnect problem."

Merge commit '0c428e4d4f1cec0aa61f897b8466185c9e06de10'

* commit '0c428e4d4f1cec0aa61f897b8466185c9e06de10':
  Revert "adb: Another attempted workaround for the adb disconnect problem."