am 2520df14: am 397f2ea4: Merge "Change sysconf(3) to return long"

* commit '2520df14f7f17aec96d4b5d6d193ff688ec83e21':
  Change sysconf(3) to return long