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

Change-Id: I3ad2dc34be1bc267ee8460e261c76bf7016651e3