Merge "Don\'t include <sys/sysconf.h>."
am: ac6335c

* commit 'ac6335cdc222a0a2e84c0ff99b8821d4c58ef4d2':
  Don't include <sys/sysconf.h>.

Change-Id: Icf0332786d942da1cccaff8d4224bf53e6ddd3ed