Upstream internal Google protobuf changes

Major changes:
 * New table-driven optimization for marshal, unmarshal, and merge
 * Unknown field preservation for Proto3
 * Generated source-file annotation for Kythe
 * Various bug fixes

_conformance/conformance.go

@@ -95,19 +95,18 @@ var jsonMarshaler = jsonpb.Marshaler{
 
 func handle(req *pb.ConformanceRequest) *pb.ConformanceResponse {
 	var err error
-	var msg pb.TestAllTypes
+	var msg pb.TestAllTypesProto3
+	var msg1 pb.TestAllTypesProto2
+	var isProto3 bool = bool(req.MessageType == "protobuf_test_messages.proto3.TestAllTypesProto3")
 	switch p := req.Payload.(type) {
 	case *pb.ConformanceRequest_ProtobufPayload:
-		err = proto.Unmarshal(p.ProtobufPayload, &msg)
+		if isProto3 {
+			err = proto.Unmarshal(p.ProtobufPayload, &msg)
+		} else {
+			err = proto.Unmarshal(p.ProtobufPayload, &msg1)
+		}
 	case *pb.ConformanceRequest_JsonPayload:
 		err = jsonpb.UnmarshalString(p.JsonPayload, &msg)
-		if err != nil && err.Error() == "unmarshaling Any not supported yet" {
-			return &pb.ConformanceResponse{
-				Result: &pb.ConformanceResponse_Skipped{
-					Skipped: err.Error(),
-				},
-			}
-		}
 	default:
 		return &pb.ConformanceResponse{
 			Result: &pb.ConformanceResponse_RuntimeError{
@@ -124,7 +123,12 @@ func handle(req *pb.ConformanceRequest) *pb.ConformanceResponse {
 	}
 	switch req.RequestedOutputFormat {
 	case pb.WireFormat_PROTOBUF:
-		p, err := proto.Marshal(&msg)
+		var p []byte
+		if isProto3 {
+			p, err = proto.Marshal(&msg)
+		} else {
+			p, err = proto.Marshal(&msg1)
+		}
 		if err != nil {
 			return &pb.ConformanceResponse{
 				Result: &pb.ConformanceResponse_SerializeError{

descriptor/descriptor_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/descriptor"
-	tpb "github.com/golang/protobuf/proto/testdata"
+	tpb "github.com/golang/protobuf/proto/test_proto"
 	protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
 )