Merge "Link shared libs to x86/x86_64 folder if available" into main am: 651fa751

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



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