Merge "Add synchronous SurfaceFlinger tracing"