Merge "Fix module-file name collisions" am: b22c6b25 am: 0513ec62 am:...

Merge "Fix module-file name collisions" am: b22c6b25 am: 0513ec62 am: 7c6ec809 am: babd87a6 am: 36b959d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2199583



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