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

* commit '1531cee658ecc46a8eda3c1bc13a09fd4fa73eb9':
  adb: remove workaround for b/6558362.