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

* commit '85c04dfeb6cf1a260ab87434fbeb8f315f6caa14':
  adb: remove workaround for b/6558362.