Merge changes I55af2ec2,I4aa5b86c

* changes:
  SurfaceFlinger: add thread name to OneShotTimer
  SurfaceFlinger: fix OneShotTimer timespec overflow