Merge "Clean up the x86-64 and x86 setjmp families."