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

diff --cc services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp
index 5f90c7a,0b84184..1d3a1d3
--- 1/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp
--- 2/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp
+++ b/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp
@@@ -21,9 -21,10 +21,9 @@@
  
  #include <gui/Surface.h>
  #include <gui/BufferItemConsumer.h>
 -#include <gui/GraphicBufferAlloc.h>
  
  #include <ui/GraphicBuffer.h>
- #include <ui/vec4.h>
+ #include <math/vec4.h>
  
  #include <GLES3/gl3.h>