Merge "SurfaceFlinger: EventThread: Fix Vsync array size."