Merge "Fix module-file name collisions" am: b0b4202592 am: 353bf7e452 am: 008786818b am: 00dbd49c3c am: 24965b9326

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

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