Merge "Fix VtsHalDrmV1_0Target clearkey tests." into oc-mr1-dev am: d85a098767
am: cd6c66c430

Change-Id: Ie2c9939fa3b9f26cd9c0f64006fd8f9912f795cd