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: 4b971d70 am: 344d5b61

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



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