Fix builds with LLVM < 3.6
auto merge of #16520 : dotdash/rust/fix_llvm_before_36, r=thestinger