am 320ead2a: am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."

* commit '320ead2ac37fbce69d84a39da28ce873b4a816d7':
  adb: Fix 'adb forward --no-rebind'.