Merge "Use extra_cfg rather than add_module_block." into main am: de7434b405

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

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