am 3754bfd4: am 58fcd13c: Merge "Fix up slang for merge through LLVM r163557." into jb-mr1-dev

* commit '3754bfd4d645a501c93ca1713eb27bc70121906a':
  Fix up slang for merge through LLVM r163557.