Merge "surfaceflinger: fix missing pure virtual declarations."