Merge "SurfaceFlinger: pass frame deadline to Choreographer"