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

Change-Id: Ia56fcef8dc9de7cd2b917b413f699ea817e9fb68