Merge "Let adbd set service.adb.tcp.port."