Merge "Rename CFI blocklist file."