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

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

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