surfaceflinger: make vsync injection more robust
am: 6200eacdc9

Change-Id: Ie04e3e56b035ea9e52038de49a2e5c2e67c8abe2