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

Change-Id: Ifd66fdb4891e08239a3c624ac82b80dcdd80d33d