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

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

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



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