Merge "Fix the sysconf _SC_2_VERSION test."