Merge "Remove non-public interfaces from resolv_netid.h"