surfaceflinger: make vsync injection more robust am: 6200eacdc9 am: ffbf2d94a1 am: 3c192d059e
am: 2f5bd00133  -s ours

Change-Id: Ia99bdfcb0f024ae145a5fbd760c6c519e6067158