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
am: 9c29f97  -s ours

* commit '9c29f971aeb4c29fbba29cdbbd776d97baecf0c2':
  DO NOT MERGE More OMX struct checking

Change-Id: I44033ecaae5b986b54425bd78982a27ed6166f31