Merge "AArch64: Correction to OMX_U32 and OMX_S32"