am 3c49c6ec: am 759111ca: Merge "Simplify the SYSCALLS.TXT format."

* commit '3c49c6ec49e0a4170ff7c9c74ac2e76b9b846ced':
  Simplify the SYSCALLS.TXT format.