Merge changes I91b38c51,Ic62bfb68

* changes:
  [SurfaceFlinger] Allow DispSync to be GMock'd
  [SurfaceFlinger] Hide SyncFeatures behind RenderEngine