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

This reverts commit e4eef292816073aa09f7208f53ae2b4136fcec07.

Reason for revert: <Fixed the issue that broke master builds>

Test: m -j
Change-Id: I0db151ef351dc18d1ff9646215669c0be4fe0452
1 file changed