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

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