Merge "media.c2 aidl: Unwrap AHardwareBuffer based handle from existing APIs" into main