am c796025f: Merge "Revert "Android ucontext refinements (upstream backport)"."

* commit 'c796025f7dc5f8df7c0f9c76bcaee96a7716912d':
  Revert "Android ucontext refinements (upstream backport)".