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