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

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

Change-Id: Ib7acd72ddb459253883805fd40bcc956dd436fc4