Merge "Add strictmode check for getaddrinfo"
am: e7ac406276

Change-Id: I78924f5893d2b7a6f295bd815ab17be72fa10c10