Merge "Add x86_64 ucontext.h for better compatibility"