Merge "Revert^3 "Reland linking shared_libs to their modules"" into main am: 31356199

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



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