Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."