am f15ef748: Merge "Use the asm-generic ucontext.h for arm."

* commit 'f15ef748c4dc42053204f1e5697fe8cf98b7dc46':
  Use the asm-generic ucontext.h for arm.