[demangle] Copy back some NFC commits from LLVM

GitOrigin-RevId: 183b5d38d7cffc10ff9f4914b8879ed5b1976e40
2 files changed