Changes from 3.7 merge to files not in upstream

unittests/Bitcode/NaClBitReaderTest.cpp

 //===- llvm/unittest/Bitcode/NaClBitReaderTest.cpp - Tests for BitReader --===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Bitcode/BitstreamWriter.h"
 #include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Verifier.h"
-#include "llvm/PassManager.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "gtest/gtest.h"
 
 namespace llvm {
 namespace {
 
 static std::unique_ptr<Module> makeLLVMModule() {
   std::unique_ptr<Module> Mod(new Module("test-mem", getGlobalContext()));
 
@@ skipping 40 matching lines @@
   std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer(Mem.str(), "test", false);
   ErrorOr<Module *> ModuleOrErr =
       getNaClLazyBitcodeModule(std::move(Buffer), getGlobalContext());
   EXPECT_EQ(false, bool(ModuleOrErr));
   std::string BadMessage("Invalid data after module");
   EXPECT_EQ(BadMessage, ModuleOrErr.getError().message());
 }
 
 }
 }