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

Change-Id: I3850e57a8978bceb9004926a125a67e5285fef06