this branch for testing nsdata perfomance
Merge remote-tracking branch 'origin/NSData'

Conflicts:
	src/ProtocolBuffers/ProtocolBuffers/runtime-pb-swift/Descriptor.pb.swift
	src/ProtocolBuffers/ProtocolBuffers/runtime-pb-swift/SwiftDescriptor.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/Perfomance.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_custom_options.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_embed_optimize_for.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_enormous_descriptor.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_import.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_import_lite.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_import_public.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_import_public_lite.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_lite.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_lite_imports_nonlite.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_mset.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_no_generic_services.pb.swift
	src/ProtocolBuffers/ProtocolBuffersTests/pbTests/Unittest_optimize_for.pb.swift
	src/compiler/Descriptors/Descriptor.pb.swift
	src/compiler/Descriptors/SwiftDescriptor.pb.swift
	src/compiler/Tests/Unittest.pb.swift
	src/compiler/Tests/Unittest_custom_options.pb.swift
	src/compiler/Tests/Unittest_embed_optimize_for.pb.swift
	src/compiler/Tests/Unittest_enormous_descriptor.pb.swift
	src/compiler/Tests/Unittest_import.pb.swift
	src/compiler/Tests/Unittest_import_lite.pb.swift
	src/compiler/Tests/Unittest_import_public.pb.swift
	src/compiler/Tests/Unittest_import_public_lite.pb.swift
	src/compiler/Tests/Unittest_lite.pb.swift
	src/compiler/Tests/Unittest_lite_imports_nonlite.pb.swift
	src/compiler/Tests/Unittest_mset.pb.swift
	src/compiler/Tests/Unittest_no_generic_services.pb.swift
	src/compiler/Tests/Unittest_optimize_for.pb.swift
	src/compiler/swift_file.cc
	src/compiler/swift_message.cc