am 3c1504d9: am 48f25cef: Merge "Stop generating <sys/linux-syscalls.h>."

* commit '3c1504d9d7d529b8281a447dc69af3ecf6b5ec83':
  Stop generating <sys/linux-syscalls.h>.