Merge "make gdbclient work on x86"