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

* commit 'a6364e257d6b0be3c94819cd16fffa2d4d7c8150':
  omx: fix structure sizes to be the same on 32 and 64-bit builds