Merge "vts: VtsHalGraphicsMapperV2_1TargetTest fixup's" into rvc-dev am: 9fe0114a33

Change-Id: Ie8ccab725b1d207c14125ef5f1adb20f01b28802