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

Change-Id: I88b1726621257074e9b4c3bc415d255d9fb3a74f