am 83c94c6d: am 98efae4c: Merge "Fill in missing bits in x86(_64) ucontext_t"

* commit '83c94c6d60d6615c69cb0548c1b846f210f93262':
  Fill in missing bits in x86(_64) ucontext_t