Merge "Fix up slang for merge through LLVM r163557." into jb-mr1-dev