Merge "Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:...

Merge "Merge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126c am: e25ff013 am: f54f5b54  -s ours am: a79dd03c  -s ours am: 4567d7b7 am: 24bb5389 am: ee8c091a  -s ours" into mnc-dev am: 0bbfc1a7 am: 8aa3c638 am: acc06d43 am: c4cfcb94  -s ours am: bfb69e61 am: 9d617698  -s ours
am: b23a0c89  -s ours

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

Change-Id: Ie0c01433c219a39a370a8108377147bc0b0107e1