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

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

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