Merge "Remove NetdService, NetworkStackClient dependency"