Merge "Disable VNDK runtime checking" into oc-mr1-dev