Merge "surfaceflinger: add frame duration logging"