Merge "adbd: allow port configuration on host."
am: 2fd9d735ea

Change-Id: I519b2c84ed20eb04aa994db24dee6481a925749a