am 804147cb: am edb7cad9: Merge "Actually set the header guard in "linux-syscalls.h"."

* commit '804147cb7d533f5635da6adc28fbca1467a3078b':
  Actually set the header guard in "linux-syscalls.h".