Merge "DO NOT MERGE More OMX struct checking" into lmp-dev am: a3c7788  -s ours am: 3127286 am: 9385896 am: 7815d4f  -s ours am: 2b62ab3 am: cacd04d
am: 88473e1

* commit '88473e14e7d4bc360a16310523eadca9aceed46f':
  DO NOT MERGE More OMX struct checking

Change-Id: I5d95b13a939d31e421b21c320978f7144bc48202