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

am skip reason: skipped by user levarum

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

Change-Id: I6eca03a9723fc6b6718d91ebe1b5e336c3f899ae