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

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