Merge "vts: VtsHalGraphicsMapperV2_1TargetTest fixup's"