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

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

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