Merge "Fix module-file name collisions" am: b0b4202592 am: 353bf7e452

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

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