Resolve mingle regressions from API updates. Fix protobuf-c build.