Merge "Revert "Sandbox chre_atoms_log.h and...

Merge "Revert "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version"" into main am: fe377774 am: 567ed1b7 am: 1814a3c7

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



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