am 841a1a13: am 156c7d3d: Merge "Clean up ucontext.h TODOs."

* commit '841a1a13ec25885133249960bc5a640c90c12e6a':
  Clean up ucontext.h TODOs.