Merge "Block CFI on static libraries" into main am: 9483e487 am: 12be5967...

Merge "Block CFI on static libraries" into main am: 9483e487 am: 12be5967 am: 0fe98a99 am: 98febc23 am: 335e2955

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



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