Merge "Fix module-file name collisions" am: 7cad2e86 am: 1806deb5 am:...

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

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



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