Merge "Fix the unintialized value reported by msan" am: 3153f95a45

am: 6dd761313e

Change-Id: I5abf7371c65712410862b2fe3adf977b567fbb4d

bsdiff_arguments.cc

@@ -75,7 +75,7 @@ bool BsdiffArguments::IsValid() const {
 
 bool BsdiffArguments::ParseCommandLine(int argc, char** argv) {
   int opt;
-  int option_index;
+  int option_index = 0;
   while ((opt = getopt_long(argc, argv, "", OPTIONS, &option_index)) != -1) {
     if (opt != 0) {
       return false;