am 0abec4da: Merge "Forward-compatible fix for ucontext_t"

* commit '0abec4daa38319f371ac6555e7887f6b14f34291':
  Forward-compatible fix for ucontext_t