Merge "Patch android-21 with x86 gdbserver <sys/procfs.h> and <sys/user.h> fixes."