am 7ca4d736: am 53e70fe3: Merge "Remove unnecessary padding in ucontext_t"

* commit '7ca4d73644284a7ffce83ba62923e46c0a29ab64':
  Remove unnecessary padding in ucontext_t