Merge "Cfi function attribute for codec factory"