Merge "Fix enum field references with java_multiple_files."