Merge "Fix x86 gdbserver build."