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

Change-Id: I3260a3dcb679b6ddc8c4f983f23146f659dd4cd3