Merge "checksyscalls fix to handle "__ARM_NR_... (__ARM_NR_BASE+0x...)""