Merge "Fix reading SurfaceFlinger dump in winscope" into rvc-dev