Merge "Rename CFI blocklist file." am: e6b2b9154e

Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396

Change-Id: I9f1369c55b89117adacc70947e0530cfc54848d4