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

* commit 'affc4d809edbcb3b0e49e5ccc9821b9695a57d44':
  surfaceflinger: fix -Wunused-parameter warning