Merge "Allow adb start/stop mdnsd via ctl.start/stop"