Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: 151f40c86e

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

Change-Id: I93747e6a05c361bb62a07229a5328a33b1be8114