Merge "build: fix vendor symbols in gdb"