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

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



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