surfaceflinger: make vsync injection more robust am: 6200eacdc9
am: ffbf2d94a1

Change-Id: I2f007234616adaff87866089bec9be000412e7cb