Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: 151f40c86e am: 3e0481a510 am: 4c9058b8cc am: 92acd668ca

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

Change-Id: Iec8b53aca079d09ae651f0b9e8b6fd88bc0a98fa