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

Change-Id: I28b5b90beb71edfc08a58a5dbc478a64955896d7