Merge changes from topic "am-c6b8230339e24a95948ea129db34cb0d"

* changes:
  Merge changes from topic "am-3cb4ee1e5c574467a4389675df3d49f9" into android12L-tests-dev am: 5b935518c3
  [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