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

Change-Id: Ie66587e82e13957d4a802699f78c41a1bce378b2