Merge changes I7a995415,Idfce2573

* changes:
  SurfaceFlinger: return DisplayStatInfo from getDisplayStatInfo
  SurfaceFlinger: optimize frame rate override