Merge "Remap existing EAI_SYSTEM to avoid relying on global errno variable"