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

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

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