Merge "cc_cmake_snapshot: fix cc_test and cc_benchmark" into main am: e07a19bc

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



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