Merge "SurfaceFlinger: refactor frame time tracking"