am 3211c04a: Merge "ndk: arm: Update <asm/ptrace.h> and <asm/user.h>"

* commit '3211c04af13ce0d5a5280fa0ba6cdcd5760a542e':
  ndk: arm: Update <asm/ptrace.h> and <asm/user.h>