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

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

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



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