[automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours am: e1c9dbc5ba -s ours

am skip reason: skipped by user levarum

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110

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