Merge changes Ib9023881,I84a5a99f

* changes:
  SurfaceFlinger: fix reference time for transactions
  SurfaceFlinger: override frame rate for applications that use setFrameRate