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

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



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