Merge "cc_cmake_snapshot: improve support for AIDL" into main am: a910dce1

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



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