Merge "64-bit: Correction to OMX_U32 and OMX_S32"