Merge "test-hwc2: fix build error from ui/mat4.h include"