Merge "media.c2 aidl: Apply bufferpool based allocator interface change" into main