Make protobuf240a build

backported from protobuf241.rb