Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev