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

Change-Id: I2e25654bf2cfe00cd80d0903ff065b1e1f093467