Rename header file.
Update include files.

llvm-svn: 59284
diff --git a/clang/lib/Analysis/LiveVariables.cpp b/clang/lib/Analysis/LiveVariables.cpp
index 03a4bc7..98b1ee2 100644
--- a/clang/lib/Analysis/LiveVariables.cpp
+++ b/clang/lib/Analysis/LiveVariables.cpp
@@ -276,11 +276,11 @@
 namespace {
 
 struct Merge {
-  typedef ExprDeclBitVector_Types::ValTy ValTy; 
+  typedef StmtDeclBitVector_Types::ValTy ValTy; 
     
   void operator()(ValTy& Dst, const ValTy& Src) {
     Dst.OrDeclBits(Src);
-    Dst.AndExprBits(Src);
+    Dst.AndBlkExprBits(Src);
   }
 };