Merge "vts: VtsHalGraphicsMapperV2_1TargetTest fixup's" into rvc-dev am: 9fe0114a33 am: 7cd31660d4 am: 2297f4dcd3

Change-Id: I3001eda67ab7f86c56acabbc00e142b7f4ca1484