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

am: 0e2ce383d2

Change-Id: I3037dc2ae7cfb7e8277700618425430ce1d9b684

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