Merge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20 am: 47748b754c am: 5d0bd13538
am: d640465c5d

Change-Id: Ie0a42ede086cc480830c91e770eaf250bcd2f711