Merge "Allow vendor_init to set service.adb.tcp.port"