Merge "Switch NetworkInterface to one getifaddrs call."