Merge "netd: Replace iface with opaque netid in resolver."