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 am: 8aa3c63
am: acc06d4

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

Change-Id: I88829b994b6e30205a2247a183a55d0bf3fbd18c