am cc1de48d: adb: Another attempted workaround for the adb disconnect problem.

Merge commit 'cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad'

* commit 'cc1de48dcdf06c76ee14abbe2a237aa51b5b3bad':
  adb: Another attempted workaround for the adb disconnect problem.