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

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