Merge "media.c2 aidl: Add decoder output allocator interface"