am 524694c4: am 529e07e9: Merge "Fix up slang for LLVM upstream merge to r162314." into jb-mr1-dev

* commit '524694c49491eb2e584fef25a5cccd2f103d5545':
  Fix up slang for LLVM upstream merge to r162314.