Merge changes I38d43b72,I7b70a9df into qt-r1-dev

* changes:
  [SurfaceFlinger] Add vsync offset information to systrace.
  [SurfaceFlinger] Split VSyncModulator into .cpp/.h files