Merge "vts: VtsHalGraphicsMapperV2_1TargetTest fixup's" am: 007c8457ec am: c1d9cd790f

Change-Id: I16406aafb711bba59034a09ffde27c670208263b