Merge "Add SurfaceFlinger tracing"