Merge "Fix module-file name collisions" am: b0b42025 am: 353bf7e4 am: 00878681

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2202568



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