Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: 3e21821be8 am: 5e78e9e93a

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

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