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: 5c58878a am: 7fe8d2f3

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



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