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

* commit '1a923b87':

Change-Id: Ib73935058beefcd3a21a1fa70d06e2c84235c6ae