am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '4d7f9ad71771fff628e88d463af94b44457b7934':