Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into...

Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ff am: 0ea94eb4 am: 88cdfd0a

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



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