Merge "Revert "mixed builds correctly reference stubs libs"" am: dc0a4021...

Merge "Revert "mixed builds correctly reference stubs libs"" am: dc0a4021 am: e2a2f118 am: a447f6a3

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



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