Merge pull request #2784 from acozzette/log-2-floor-int

Return uint32 from Log2FloorNonZero64

src/google/protobuf/stubs/port.h

@@ -358,7 +358,7 @@ class Bits {
 #endif
   }
 
-  static uint64 Log2FloorNonZero64(uint64 n) {
+  static uint32 Log2FloorNonZero64(uint64 n) {
 #if defined(__GNUC__)
   return 63 ^ __builtin_clzll(n);
 #else