Merge "mixed builds correctly reference stubs libs" am: 0c3682be

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



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