Remove duplicate method declarations

Harmless, but generate a lot of warning spam.
Regen descriptor protobuffs to be compatible with 2.5
Pulling from jensayton to get repeated method decleration fix

Merge branch 'master' of https://github.com/JensAyton/protobuf-objc