Merge "Use extra_cfg rather than add_module_block." into main am: de7434b405 am: 8b88c05e37 am: 28de738796

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/2841614

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