am 9d6abbda: am 9f573bb3: am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"

* commit '9d6abbdaccd520055fc47b6b3b36232cf23897fd':
  Fix adb forward --list when forwarding a lot