Merge "SurfaceFlinger: add TracedOrdinal"