Fix module-file name collisions

Bazel doesn't allow a module and file with the same name.

Bug: 198619163
Test: Presubmits
Change-Id: I4767071d591c89cea8c2d53e4bd41eb3405a36be
2 files changed