Merge "Blacklist cfi for libavc"