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

Change-Id: Ie19e3ef1c704f9318f067c03ccc75fdf6727fa89