carto/protobuf @ 541b1735a89e829b44dc21f1ea11fc36e158c49c

Adam Cozzette 541b1735a8 Merge branch 'master' into 3.15.x-202103031418		4 lat temu
..
src	f645c7ed07 Fixed spelling errors surfaced by CodeSpell.	4 lat temu
BUILD	6bbd56dfd9 Bazel: Discontinue JDK 7 compatibility support	5 lat temu
generate-sources-build.xml	49efe9d7db Restructuring protobuf to multiple modules	9 lat temu
generate-test-sources-build.xml	cb390216cf Fixed the Java build.	5 lat temu
pom.xml	fd8aabf32d Update protobuf version	4 lat temu