am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded':