Merge "[codec importance] Add aconfig feature flags" into main