Merge "Don't reference target-specific variable from dependency list" into...

Merge "Don't reference target-specific variable from dependency list" into main am: baf2c6bf am: 890b2aaf

Original change: https://android-review.googlesource.com/c/platform/build/+/3094565



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