Merge "codec2: fix public definiton for C2ComponentStore"