Merge "Revert "Android ucontext refinements (upstream backport)"."