Merge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126cb0 am: e25ff0130e
am: f54f5b54bd  -s ours

* commit 'f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6':
  DO NOT MERGE More OMX struct checking

Change-Id: I4c079e3f5ac920005dcbba2af992312fbf35f5bc