Merge "EABI syscall cleanup."