Merge "Map cargo2android.json dep-suffixes to module_name_overrides." into main