Merge "adb: Fix 'adb forward --no-rebind'."