am 7685fd54: am 85c04dfe: am 1531cee6: Merge "adb: remove workaround for b/6558362."

* commit '7685fd549294e31365081f0a282bef03bf1a9e74':
  adb: remove workaround for b/6558362.