Amend previous cherry-pick; need to fetch all syscall stuff.
Source for buildrump.sh git rev f59aec09e066bc26aa747bb163229d0d5f2f3f5f