Merge "adbd: allow port configuration on host." am: f150262a59
am: bd23cb37cf

Change-Id: I5ba08f00180ba81033a7d1388e7e2247c7246237