Merge "Make SurfaceFlinger tracing synchronous by default"