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