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

Change-Id: I4273bb635dc053dbc5c973d6dc1644b4a7afb46d