Merge "adb: Improve ADB's forward redirection management."