Merge "Fix sysconf(_SC_NPROCESSORS_CONF) on ARM."