Added changes needed to integrate latest clang_complete with clang_indexer