Merge "Fix module-file name collisions" am: 7cad2e8654 am: 1806deb5d4

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2205530

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