Update third_party/protobuf to protobuf-v3.0.0-beta-3

third_party/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java

Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java
diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/FieldSet.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java
similarity index 98%
rename from third_party/protobuf/java/src/main/java/com/google/protobuf/FieldSet.java
rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java
index 47924b657c9112a5ecdfb65e9c26856eaf37e259..4e89709f32cf67837c150fc43654877b995e57d7 100644
--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/FieldSet.java
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java
@@ -120,6 +120,25 @@ final class FieldSet<FieldDescriptorType extends
   public boolean isImmutable() {
     return isImmutable;
   }
+  
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    
+    if (!(o instanceof FieldSet)) {
+      return false;
+    }
+    
+    FieldSet<?> other = (FieldSet<?>) o;
+    return other.fields.equals(other.fields);
+  }
+  
+  @Override
+  public int hashCode() {
+    return fields.hashCode();
+  }
 
   /**
    * Clones the FieldSet. The returned FieldSet will be mutable even if the