Merge "Remove workaround for VNDK violations" into oc-mr1-dev