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

* commit '71142c8d9221dd86a71e181aedec865793e2ee7e':
  Patch android-21 with x86 gdbserver <sys/procfs.h> and <sys/user.h> fixes.