Merge "Update test configure for VtsHalGraphicsComposerV2_1TargetTest" into oc-mr1-dev