Merge "Revert^2 "Reland linking shared_libs to their modules"" into main am: 8d2c77de

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



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