Merge "Use the correct names for the __ARM_NR_* syscalls."