Merge "Fix incorrect name for x86 platform's gdb"