Merge \\"Fix google-explicit-constructor warnings in bsdiff\\" am: 58632a3b7c

am: 6857c2c0a8

Change-Id: I03c82315091d0d211b4fbbe6c1dc426af1466cc1

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_;
 };