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

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



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