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

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

Change-Id: Ic482adf7a2e96a311cdc28a3bb920b9e3ff41ec6