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

Change-Id: Ib33039bcffc1104bb9a43c08af83d7b7b5407a61