Merge "surfaceflinger: update for IComposer changes"