am 9459b5c4: Merge "Fix enum field references with java_multiple_files."

* commit '9459b5c45b0ad33bea9376c2afb66cf93da610ac':
  Fix enum field references with java_multiple_files.