am 5725f319: Merge "Android ucontext refinements (upstream backport)."

* commit '5725f3197b98021df10ce3655cddecb7c118baaa':
  Android ucontext refinements (upstream backport).