Merge "DO NOT MERGE More OMX struct checking" into lmp-dev am: a3c7788  -s ours am: 3127286
am: 9385896

* commit '9385896fa3e2df582c3106604fe79a818a0c525e':
  DO NOT MERGE More OMX struct checking

Change-Id: I28618963e39ad9ab70d9a358a7645cef5f5ce001