Fix module-file name collisions am: 5c59fcd996

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2203462

Change-Id: I134ce2ab4b5662cfee2709f02241ec48f43e3e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>