Merge "Fix slang to compile with LLVM r275480"
am: 1689f351bf

Change-Id: I69f07fd5196534fcb7efc9a378557c0a4f546573