Merge "Android ucontext refinements (upstream backport)."