Merge changes from topic "16k-emulator-x86-64" into main am: cd347013 am:...

Merge changes from topic "16k-emulator-x86-64" into main am: cd347013 am: bd0c819d am: d639dc84

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



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