Revert "Revert "mixed builds correctly reference stubs libs"" am: 75dbca2e...

Revert "Revert "mixed builds correctly reference stubs libs"" am: 75dbca2e am: 939ef922 am: 064d243a

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



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