Merge "More OMX struct checking" into mnc-dev