Merge "Remove NativeDaemonConnector relevant files"