Merge "Fix SurfaceFlinger_test on WCG devices" into udc-dev