Merge "test-hwc2: fix build errors on other branches"