Merge "Revert "Symlink shared libs to their module in general-tests.zip"" into main am: 1b5aa60727

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

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