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

* commit '24bb5389eef47288d947115bfee13ceceebddab8':
  DO NOT MERGE More OMX struct checking

Change-Id: I4ec81d779d064862ef01e397497d0c7acb359e44