Merge "test-hwc2: Fix hwc2-tests"