Fix module-file name collisions am: 453ead6f6e am: a1e40b9698 am: e9fa6bc259

Original change: https://android-review.googlesource.com/c/platform/art/+/2203415

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