Merge "Revert "Block CFI on static libraries"" into main am: 44e41023 am:...

Merge "Revert "Block CFI on static libraries"" into main am: 44e41023 am: 2ba08f1f am: dde52d1d am: 80bffb2d am: b20546dc

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



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