am a6597598: Merge "fix adb {forward,reverse} --no-rebind"

* commit 'a6597598a0b82759960df09fd173192ca8c82f0c':
  fix adb {forward,reverse} --no-rebind