Merge "Link shared libs to per test module folder in host-unit-tests.zip" into...

Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main am: fb308d3c am: f5893e40

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



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