Merge "Sync with upstream for gethnamaddr.c."