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

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

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