Remove dependencies on the 1-variant fallback

When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.

Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
(cherry picked from https://android-review.googlesource.com/q/commit:a6aaa73fa2bed7ca5492ca7866d696eb01f5418a)
Merged-In: Icae20ecc05c97dd59437b7cdc23db7363c869c28
Change-Id: Icae20ecc05c97dd59437b7cdc23db7363c869c28