Merge "Fix VtsHalGraphicsComposerV2_1TargetTest" into oc-mr1-dev am: 8d2d1d08a1
am: 3b77b81ead

Change-Id: Icd3b29309102fb0ef30f3030c6598d8b1c7df28a