Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev