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

Change-Id: I32722bda198aae3d7772e81170c825ed27eb6d79