Merge "media.c2 aidl: Add AHardwareBuffer based C2Allocator" into main