Merge "Fix VtsHalGraphicsComposerV2_1TargetTest" into oc-mr1-dev