Joshua Haberman c077d949d8 Merge branch '3.12.x' into merge-312 5 lat temu
..
src 0a737d8eb0 Sync from Piper @313142438 5 lat temu
BUILD 6ed738305b Sync from Piper @311396324 5 lat temu
generate-sources-build.xml 49efe9d7db Restructuring protobuf to multiple modules 10 lat temu
generate-test-sources-build.xml 6ed738305b Sync from Piper @311396324 5 lat temu
pom.xml beeb621f50 Update protobuf version (#7557) 5 lat temu