Fix build against LLVM SVN >= r216393

Tested-by: Aaron Watry <awatry@gmail.com>
Fix build against LLVM SVN >= r216488

Tested-by: Aaron Watry <awatry@gmail.com>