Joshua Haberman c077d949d8 Merge branch '3.12.x' into merge-312 %!s(int64=5) %!d(string=hai) anos
..
src 6ed738305b Sync from Piper @311396324 %!s(int64=5) %!d(string=hai) anos
BUILD f0cb9cdb95 [bazel] Move Java runtime/toolchains into //java (#7190) %!s(int64=5) %!d(string=hai) anos
pom.xml beeb621f50 Update protobuf version (#7557) %!s(int64=5) %!d(string=hai) anos