am 3a49aa7b: am 9428a289: Merge "Only include ucontext.h when necessary."

* commit '3a49aa7b19945b369221ce486778d7cd70ad066f':
  Only include ucontext.h when necessary.