Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/NoExitRuntime.cpp

Index: lib/Transforms/NaCl/NoExitRuntime.cpp
diff --git a/lib/Transforms/NaCl/NoExitRuntime.cpp b/lib/Transforms/NaCl/NoExitRuntime.cpp
index 5c9822abcb01cd4488ba219ad99139a817a9cf62..96ceea7d9b65bd881b586e494b4a66638b52f314 100644
--- a/lib/Transforms/NaCl/NoExitRuntime.cpp
+++ b/lib/Transforms/NaCl/NoExitRuntime.cpp
@@ -23,7 +23,7 @@
 #include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/IR/CFG.h"
-#include "llvm/Target/TargetLibraryInfo.h"
+#include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Transforms/NaCl.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include <map>
@@ -94,4 +94,3 @@ bool NoExitRuntime::runOnModule(Module &M) {
 ModulePass *llvm::createNoExitRuntimePass() {
   return new NoExitRuntime();
 }
-