SPAConsumer changed according to Clang's changes in ASTConsumer
Merge remote-tracking branch 'upstream/master'