Change sysconf(3) to return long

See bionic 60d84af1726225320b26683b726e5e735d9d76e8

BUG=18390956

Change-Id: I20c6aa48115610b35e1d59f9f37ce5abbe6ac2f7
Merge "Change sysconf(3) to return long"
Fix headers to be included alone

Change-Id: I7eb9a6ed51b938506d440b91e6b3d42daf817fd7
Merge "Fix headers to be included alone"