Merge "media.c2 aidl: Use bufferpool2 V2" into main