Merge \"Fix google-explicit-constructor warnings in bsdiff\"

am: 58632a3b7c

Change-Id: Ifef4d6f4b4872d055d6615de1f180db6f2bbc01c

file.h

@@ -29,7 +29,7 @@ class File : public FileInterface {
  private:
   // Creates the File instance for the |fd|. Takes ownership of the file
   // descriptor.
-  File(int fd);
+  explicit File(int fd);
 
   int fd_;
 };