Merge "Rename modules in the same way as cargo2android.py." into main am: d4b40e7b96

Original change: https://android-review.googlesource.com/c/platform/development/+/2767860

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