[automerger skipped] Merge "Use AI_ADDRCONFIG for most DNS requests" am: b19a838f47 am: aa6ddd6685  -s ours
am: bd531604e0  -s ours

Change-Id: I14b2f2e1e7e2f7a20fc9d9ca4f614c1bbec09ec7