Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev