Merge "mixed builds correctly reference stubs libs" am: 0c3682be am: 4a94e7df am: 8587cf5e

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



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