Merge \\"Avoid re-calculating vsync mid-frame\\" into nyc-dev am: fc275d244e
am: 2d30d67249

Change-Id: I0103204092482cf5dee1ac2d3402cb6730b2d671