Merge "aconfig: update c/c++ codegen" into main