Merge "media.c2 aidl: add input surface for encoders" into main