Merge "Add Surface::waitForNextFrame" into nyc-dev
am: dc71beb

* commit 'dc71bebc3d65918ec5c1c7cea1dae0a0af5468d7':
  Add Surface::waitForNextFrame

Change-Id: I348c555c1ff80588fffffbe804f6d3a7ee0e15c0