Merge "Actually set the header guard in "linux-syscalls.h"."