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

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

Change-Id: I0a7b287a0cbad51aa9b5e516fe6517afd7aa1ceb