Merge "adb: change mdns tls service names (RFC 6763)."