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

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

Change-Id: I62cb235634a9682331800a006ae1033f9f14281d