Clean up the x86-64 and x86 setjmp families.

Bug: 16918359
Change-Id: Ic8ca0af9ea99636bc71f19d46071f1cea6eef982
Merge "Clean up the x86-64 and x86 setjmp families."