Merge "NsdService: disentangle NativeDaemonConnector from ctor"