Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-dev