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

Change-Id: I6067baac6971af84d7fd6f1480f14ff5f4c61b72