Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."