Merge "Redefine OMX_U32 on 64-bit architecture"