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

Change-Id: Iaf5342c095f60f1c14a65f96efb42ab4f1914bf8