Merge "Fix module-file name collisions" am: 7cad2e86 am: 1806deb5 am: 363eb134 am: 756a1117

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



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