R220956 broke lldb TOT. In the file clang/include/clang/AST/Decl.h, there were some typedef's inside VarDecl, FunctionDecl classes mapping clang::StorageClass to StorageClass. R220956 removed these typedefs.
In ClangASTContext.cpp, there were a few places using the old typedefs so I switched to use properly scoped name.