Merge "Fix symbol.py's toolchain detection for x86."