Fix PNaCl-local files after merging LLVM 3.4

lib/Bitcode/NaCl/Reader/NaClBitcodeHeader.cpp

 //===- NaClBitcodeHeader.cpp ----------------------------------------------===//
 //     PNaCl bitcode header reader.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
@@ skipping 181 matching lines @@
   BufPtr += NumBytes;
   InstallFields();
   return false;
 }
 
 bool NaClBitcodeHeader::Read(StreamableMemoryObject *Bytes) {
   unsigned NumFields;
   unsigned NumBytes;
   {
     unsigned char Buffer[2 * WordSize];
-    if (Bytes->readBytes(0, sizeof(Buffer), Buffer, NULL))
+    if (Bytes->readBytes(0, sizeof(Buffer), Buffer))
       return UnsupportedError("Bitcode read failure");
     if (ReadPrefix(Buffer, Buffer + sizeof(Buffer), NumFields, NumBytes))
       return true; // ReadPrefix sets UnsupportedMessage
   }
   uint8_t *Header = new uint8_t[NumBytes];
   bool failed =
-      Bytes->readBytes(2 * WordSize, NumBytes, Header, NULL) ||
+      Bytes->readBytes(2 * WordSize, NumBytes, Header) ||
       ReadFields(Header, Header + NumBytes, NumFields, NumBytes);
   delete[] Header;
   if (failed)
     return UnsupportedError("Bitcode read failure");
   InstallFields();
   return false;
 }
 
 NaClBitcodeHeaderField *
 NaClBitcodeHeader::GetTaggedField(NaClBitcodeHeaderField::Tag ID) const {
@@ skipping 44 matching lines @@
                       << PNaClVersion << "\n";
     UnsupportedStream.flush();
   }
   if (Fields.size() != 1) {
     IsSupportedFlag = false;
     IsReadableFlag = false;
     if (!UpdatedUnsupportedMessage)
       UnsupportedMessage = "Unknown header field(s) found";
   }
 }