am a3fe475c: am c019345a: Merge "Use the correct names for the __ARM_NR_* syscalls."

* commit 'a3fe475c9ff444f45eb3c4dd7fd462326dfdb13d':
  Use the correct names for the __ARM_NR_* syscalls.