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