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

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



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