Merge "Codec2 base components cfi assembly support"