[automerger skipped] Merge "Revert "Revert "mixed builds correctly reference stubs libs""" into udc-dev am: 98f13dd1a0
am: 2ab30a5c86
-s ours
am skip reason: Merged-In Ifa0ed456bf8cb4a7f861d6826263adfedb4fdd9c with SHA-1 db5d662663
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374491
Change-Id: Ib1ed2031967ea296d9fab4820e89231f73d94491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: