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: 1a923b87
am: ebc3918c  -s ours

* commit 'ebc3918c':

Change-Id: I4e95f4a2ff089e913eb5b82109d635cc918d15db