Merge "Revert "Add strictmode check for getaddrinfo""
am: 6f1f107a3b

Change-Id: Iacc117cf903ead777f1c63c60630a5be70191923