Merge "Reapply "Add media.c2 AIDL service to media.swcodec"" into main