Merge "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 am: ee8c091aea  -s ours" into mnc-dev
am: 0bbfc1a781

* commit '0bbfc1a781397e2724daa6f1f3231c0cbb24fee0':
  DO NOT MERGE More OMX struct checking

Change-Id: Idb60acfbfc1b3a09c5ddc5f1417f7145f73e523e