am d1caedda: 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 'd1caedda7ba353cecbd35f6e721e8037e111e8ed':
  omx: fix structure sizes to be the same on 32 and 64-bit builds