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

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

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