Merge "Fix ifaddrs#getifaddrs_INET flakiness."
am: a279324094

* commit 'a279324094d748b97201412b2457d2f6e26287dd':
  Fix ifaddrs#getifaddrs_INET flakiness.