Merge pull request #908 from dbabokin/trunk

Tracking LLVM trunk: SmallPtrSet changes
Build fix for LLVM trunk - changed include structure