Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev