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

Change-Id: I5ba08f00180ba81033a7d1388e7e2247c7246237