Merge "Use AI_ADDRCONFIG for most DNS requests"
am: b19a838f47

Change-Id: I452da6fffe8eddedf0082c8ca7602566c82f6ebe