Merge "Fix module-file name collisions" am: e4793273da

Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971

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