Merge "Fix race condition caused by fd reused for DnsResolver"