am abf7cc97: am 13306d95: Merge "adb: Improve ADB\'s forward redirection management."

* commit 'abf7cc977e41540c45836d2fafd81606117f0399':
  adb: Improve ADB's forward redirection management.