Merge "surfaceflinger: fix -Wmismatched-tags warnings"