am 2b89f1e3: Merge "Fix sysconf(_SC_NPROCESSORS_CONF) on ARM."

* commit '2b89f1e37df838e466d382fc602728930bad4c68':
  Fix sysconf(_SC_NPROCESSORS_CONF) on ARM.