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

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