Merge "Make adb's daemon-port on the host machine configurable."