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

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

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



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