Merge "test-hwc2: Fix hwc2-tests"
am: 41e9cf9e22

Change-Id: I7b68cccfa0d22a536b41833de8470db95c29a68b