Merge "VtsHalGraphicsComposer3_TargetTest test fixes."