Merge "Convert VtsHalGraphicsMapperV*TargetTest to be parameterized test" am: f78d7734d1
am: 64426d0a06

Change-Id: I5861c3e562d8d36f0931f0c7a576c285ba05984c