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

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



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