Merge "Revert "Revert "Use FILE_NAME_TAG as part of generated jar file."""