Merge "[Resolv] Removing the relative paths between netd and resolv."